bitkeeper revision 1.1665 (42a07586HA9yxpF1JLzGs-3hmLbG5g)

More include file cleanup fixes (for CONFIG_VTI)
Also a cpumask cleanup fix
Signed-off by: Dan Magenheimer <dan.magenheimer@hp.com>

diff --git a/xen/arch/ia64/asm-offsets.c b/xen/arch/ia64/asm-offsets.c
index 0fd07578530dca8b7cc3387646f98df929b5a357..56847d15dc546b75671354d3dc4b60cb0b325427 100644 (file)
--- a/xen/arch/ia64/asm-offsets.c
+++ b/xen/arch/ia64/asm-offsets.c
@@ -11,6 +11,7 @@
 #include <public/xen.h>
 #ifdef CONFIG_VTI
 #include <asm/tlb.h>
+#include <asm/regs.h>
 #endif // CONFIG_VTI
 
 #define task_struct vcpu

diff --git a/xen/arch/ia64/vmmu.c b/xen/arch/ia64/vmmu.c
index 69f8cc7279870e735776cc10ad5d40a7ba25c69a..c39d6f285174c30c298d46618b6e416514302ec7 100644 (file)
--- a/xen/arch/ia64/vmmu.c
+++ b/xen/arch/ia64/vmmu.c
@@ -20,6 +20,7 @@
  *  Yaozu Dong (Eddie Dong) (Eddie.dong@intel.com)
  */
 #include <linux/sched.h>
+#include <linux/mm.h>
 #include <asm/tlb.h>
 #include <asm/gcc_intrin.h>
 #include <asm/vcpu.h>

diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h
index 56df1706f9670c931b7423eae49d2dcf2c86ad83..a762ec63180963e5a09c39871c76d638af4c523f 100644 (file)
--- a/xen/include/asm-ia64/mm.h
+++ b/xen/include/asm-ia64/mm.h
@@ -90,7 +90,7 @@ struct page
         /* Page is on a free list. */
         struct {
             /* Mask of possibly-tainted TLBs. */
-            u64 cpu_mask;
+            cpumask_t cpumask;
             /* Order-size of the free chunk this page is the head of. */
             u8 order;
         } free;